Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 12 Jan 2006 12:20:04 +0000 (13:20 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 12 Jan 2006 12:20:04 +0000 (13:20 +0100)
commitb85612442b24664719ab992ebf744bb7c1086955
tree2e71b129d7befc889304f3f6b4f3db3110116982
parentc6aed7c358b3f1b0e3226ef021c747a8cebe4518
parent8f2651280adf042727332a1369298d8c3ecb5afa
Merged.